Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 15:15:38 +0000 (08:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 15:15:38 +0000 (08:15 -0700)

Trivial merge